Auto merge of #1440 - tamird:rustup, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 23 Mar 2015 21:05:05 +0000 (21:05 +0000)
committerbors <bors@rust-lang.org>
Mon, 23 Mar 2015 21:05:05 +0000 (21:05 +0000)
@alexcrichton


Trivial merge